stubdom: log and documentation fixes

- Document that for vnclisten names and 127.0.0.1 should not be used.
- Documentation cosmetic fixes
- Dump qemu output to the usual logs

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>

diff --git a/stubdom/README b/stubdom/README
index 42c47601faa5b5b3fb3f6e7d32b0b16b7eb8a633..4b9bef6b19744fb30685af63a8b37f821910b61a 100644 (file)
--- a/stubdom/README
+++ b/stubdom/README
@@ -16,10 +16,12 @@ ln -s /usr/share/qemu/keymaps /exports/usr/share/qemu
 
 In your HVM config "hvmconfig",
 
-- use VNC, set vnclisten to "172.30.206.1" for instance:
+- use VNC, set vnclisten to "172.30.206.1" for instance.  Do not use a host name
+as Mini-OS does not have a name resolver.  Do not use 127.0.0.1 since then you
+will not be able to connect to it.
 
-vnc=1 
-vnclisten="172.30.206.1" 
+vnc = 1
+vnclisten = "172.30.206.1"
 
 - use /usr/lib/xen/bin/stubdom-dm as dm script
 
@@ -28,14 +30,15 @@ device_model = '/usr/lib/xen/bin/stubdom-dm'
 - comment the disk statement:
 #disk = [  'file:/tmp/install.iso,hdc:cdrom,r', 'phy:/dev/sda6,hda,w', 'file:/tmp/test,hdb,r' ]
 
-Create /etc/xen/stubdom-hvmconfig ("hvmconfig" must match your main config file)
-with
+Create /etc/xen/stubdom-hvmconfig (where "hvmconfig" is your HVM guest domain
+name) with
 
-kernel="/usr/lib/xen/boot/stubdom.gz"
-vif=[ 'ip=172.30.206.1', 'ip=10.0.1.1,mac=aa:00:00:12:23:34']
+kernel = "/usr/lib/xen/boot/stubdom.gz"
+vif = [ 'ip=172.30.206.1', 'ip=10.0.1.1,mac=aa:00:00:12:23:34']
 disk = [  'file:/tmp/install.iso,hdc:cdrom,r', 'phy:/dev/sda6,hda,w', 'file:/tmp/test,hdb,r' ]
 
 where
 - 172.30.206.1 is the IP for vnc,
-- 'ip=10.0.1.1,mac=' is the same net configuration as in the hvmconfig script,
+- 'ip=10.0.1.1,mac= etc...' is the same net configuration as in the hvmconfig
+script,
 - and disk = is the same block configuration as in the hvmconfig script.

diff --git a/stubdom/stubdom-dm b/stubdom/stubdom-dm
index 3edeb9d2dc7c5d5aabe51d500895ba1c78658e69..0c629c6868f3a8730f97e460f87011650574ea2b 100644 (file)
--- a/stubdom/stubdom-dm
+++ b/stubdom/stubdom-dm
@@ -62,11 +62,12 @@ done
 
 creation="xm create -c stubdom-$domname target=$domid memory=32"
 
-(while true ; do sleep 60 ; done) | $creation &
+(while true ; do sleep 60 ; done) | $creation > /var/log/xen/qemu-dm-$domid.log &
 #xterm -geometry +0+0 -e /bin/sh -c "$creation ; echo ; echo press ENTER to shut down ; read" &
 consolepid=$!
 
 
+# Wait for vnc server to appear
 while ! vnc_port=`xenstore-read /local/domain/$domid/console/vnc-port`
 do
         # Check that the stubdom job is still alive